-
Notifications
You must be signed in to change notification settings - Fork 42
Move pyproject.toml to root level dir #980
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sure thing.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see any changes to docker/Dockerfile
or Makefile
. Those will break if left unmodified.
pyproject.toml
Outdated
[tool.setuptools.packages.find] | ||
where = ["."] # list of folders that contain the packages (["."] by default) | ||
include = ["ssvc*"] # package names should match these glob patterns (["*"] by default) | ||
include = ["src*"] # package names should match these glob patterns (["*"] by default) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we might want this to be src/ssvc/*
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
or maybe it's where = ["./src"]
and leave include = ["ssvc*"]
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All 3 options successfully run uv sync
|
good catch. Didn't run docker... |
…convinced that this works.
Before we're done here, we should also:
|
Also note that the |
On this front, #986 makes the cut over to |
I think basically this line? I added the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR moves the Python project configuration from the src
subdirectory to the root level, standardizing the project structure and simplifying build commands.
- Relocates
pyproject.toml
fromsrc/
to root directory - Updates all build tools and CI workflows to reference the root-level configuration
- Simplifies Docker and GitHub Actions commands by removing
--project=src
flags
Reviewed Changes
Copilot reviewed 6 out of 8 changed files in this pull request and generated 2 comments.
Show a summary per file
File | Description |
---|---|
pyproject.toml | Updates package discovery paths and version file location for root-level structure |
docker/Dockerfile | Removes project-specific arguments and simplifies uv commands |
.github/workflows/python-app.yml | Updates CI commands to use root-level pyproject.toml |
.github/workflows/link_checker.yml | Updates workflow triggers and build commands for new structure |
.github/workflows/deploy_site.yml | Removes project flag from uv sync command |
.github/dependabot.yml | Removes /src directory from dependency monitoring |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
Co-authored-by: Copilot <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Regarding my comment on the Dockerfile
: I just need to check this on my local setup to confirm before approving. All other changes look good though.
…ands... ...now that pyproject.toml has moved to the top level dir
…uashed commit) Squashed commits: [94a51d0] add newline
# Conflicts: # requirements.txt
Resolves #974
This pull request refactors the project structure and updates the dependency management workflow to simplify and standardize how dependencies are installed and commands are run. The main change is the removal of the explicit use of the
src
directory in dependency installation and command execution, both in CI workflows and local development scripts. This makes the setup more straightforward and aligns the configuration across Makefile, Docker, and GitHub Actions. Additionally, the project root and versioning configuration have been updated to match the new structure.Dependency Management and Project Structure:
Removed the use of the
--project=src
flag from alluv sync
,uv run
, and related commands in CI workflows (deploy_site.yml
,link_checker.yml
,python-app.yml
), theMakefile
, and theDockerfile
, simplifying dependency installation and command execution to operate from the project root. [1] [2] [3] [4] [5] [6]Updated the
.github/dependabot.yml
configuration to remove the/src
directory from the list of directories scanned for dependency updates, reflecting the new project structure.Configuration and Versioning Updates:
pyproject.toml
fromsrc/pyproject.toml
to the project root and updated references in workflows and versioning configuration accordingly. The[tool.setuptools_scm]
section now points to the correct version file and root directory. [1] [2]Cleanup and Environment:
src/.venv
andsrc/uv.lock
in the clean target, reflecting the new structure.docker/env_example
) to help avoid container naming collisions.